From 036aada54389a92709bf342200f7dd54f821b129 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 31 Aug 2009 23:59:44 -0400 Subject: [PATCH] Fix the cups checks This was reported in bug 593712. --- configure.in | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/configure.in b/configure.in index 7093a0a054..b2857a7f00 100644 --- a/configure.in +++ b/configure.in @@ -1873,24 +1873,24 @@ else AC_SUBST(CUPS_LIBS) AC_CHECK_HEADER(cups/cups.h,,AC_MSG_ERROR([[*** Sorry, cups-config present but cups/cups.h missing.]])) - fi - AM_CONDITIONAL(HAVE_CUPS, true) + AM_CONDITIONAL(HAVE_CUPS, true) - gtk_save_cflags="$CFLAGS" - CFLAGS="$CUPS_CFLAGS" - AC_TRY_COMPILE([#include ], - [http_t http; char *s = http.authstring;], - [AC_DEFINE(HAVE_HTTP_AUTHSTRING, [], - [Define if cups http_t authstring field is accessible])],) - CFLAGS="$gtk_save_cflags" + gtk_save_cflags="$CFLAGS" + CFLAGS="$CUPS_CFLAGS" + AC_TRY_COMPILE([#include ], + [http_t http; char *s = http.authstring;], + [AC_DEFINE(HAVE_HTTP_AUTHSTRING, [], + [Define if cups http_t authstring field is accessible])],) + CFLAGS="$gtk_save_cflags" - AC_SUBST(HAVE_HTTP_AUTHSTRING) + AC_SUBST(HAVE_HTTP_AUTHSTRING) - gtk_save_libs="$LIBS" - LIBS="$CUPS_LIBS" - AC_CHECK_FUNCS(httpGetAuthString) - LIBS="$gtk_save_libs" + gtk_save_libs="$LIBS" + LIBS="$CUPS_LIBS" + AC_CHECK_FUNCS(httpGetAuthString) + LIBS="$gtk_save_libs" + fi fi # Checks to see if we should compile with PAPI backend for GTK+ -- 2.30.2